[Payment Method Improvements] Tapping Order Complete button should be equivalent tapping Mark as Paid #11587

backwardstruck · 2024-05-26T19:28:02Z

Closes: #11583

Description

This PR is to update the change due correctly based on the user input for how much cash was given.

I added the unit-tests-exemption label as this PR is dependent on others and will likely change. Updating the test is ticketed here:
[Payment] Testing: Add implementation so order details load successfully, emits success state and all tests pass #11542

Testing instructions

Enable OTHER_PAYMENT_METHODS
Go to an order that needs to be paid
Select "Cash"
Enter a cash value (try again without entering anything)
Tap "Mark Order As Complete" button

Expected:

Screen should close and return to the order screen (closing the payment method screen as well)
The order should be marked as paid/completed
Amount paid should be accurate on the order

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

dangermattic · 2024-05-26T19:28:27Z

	1 Warning
⚠️	Class `Success` is missing tests, but `unit-tests-exemption` label was set to ignore this.

Generated by 🚫 Danger

wpmobilebot · 2024-05-26T19:58:39Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`d5747fb`
	Direct Download	`woocommerce-prototype-build-pr11587-d5747fb.apk`

codecov-commenter · 2024-05-26T20:09:21Z

Codecov Report

Attention: Patch coverage is 41.17647% with 10 lines in your changes are missing coverage. Please review.

Project coverage is 40.34%. Comparing base (484b8d7) to head (d5747fb).
Report is 49 commits behind head on trunk.

Files	Patch %	Lines
...hangeduecalculator/ChangeDueCalculatorViewModel.kt	58.33%	5 Missing ⚠️
...ts/methodselection/SelectPaymentMethodViewModel.kt	0.00%	4 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #11587      +/-   ##
============================================
- Coverage     40.34%   40.34%   -0.01%     
  Complexity     5199     5199              
============================================
  Files          1087     1087              
  Lines         63250    63265      +15     
  Branches       8669     8671       +2     
============================================
+ Hits          25519    25524       +5     
- Misses        35436    35445       +9     
- Partials       2295     2296       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…ng-order-complete-button-equivalent-tapping-mark-as-paid

kidinov · 2024-05-28T14:47:41Z

WooCommerce/src/main/res/navigation/nav_graph_payment_flow.xml

@@ -70,6 +74,16 @@
        <argument
            android:name="orderId"
            app:argType="long" />
+
+        <action
+            android:id="@+id/action_changeDueCalculatorFragment_to_selectPaymentMethodFragment"


Shell, you go back and bring result with "is order paid = true/false" instead of going forward and passing "true" always? Check the setupResultHandlers method in SelectPaymentMethodFragment - I believe they do pretty much the same as what you need in order to deliver the result back

Thanks. I'll do it that way instead as you suggested. Added to this ticket for my draft PR:
#11585

kidinov · 2024-05-28T14:57:44Z

Overall some things I noted (sorry if this is already fixed in the following PRs and I repeat myself):

I think there is something wrong with margins/paddings on the UI (vertically it should be either 8/16 or 32 in some cases, and horizontally sheel we have 16 margins from the borders of the screen)? The button is not aligned with input field on the right. The input field has large margin on the left than on the right
The screen is not scrollable so not possible to click the button when the keyboard is visible
In the PR description, it says

Switched to WCOutlinedTypedTextField like it's used in OrderCreateEditProductDiscountScreen and changed the button to use WCColoredButton as suggested here by @kidinov

But I still see WCMaterialOutlinedCurrencyEditTextView is being used

We'd need to fix the layout for the text that displays the change

Just an advice for the future PR - better to make the not toggle "clickable" including the text itself and with some padding so it's easier to tap on

...tlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorViewModel.kt

kidinov

There are a few notes I left which I think worth attention, but you can fix them in the open PR so not blocking this one

backwardstruck · 2024-05-28T16:15:38Z

Overall some things I noted (sorry if this is already fixed in the following PRs and I repeat myself):

I think there is something wrong with margins/paddings on the UI (vertically it should be either 8/16 or 32 in some cases, and horizontally sheel we have 16 margins from the borders of the screen)? The button is not aligned with input field on the right. The input field has large margin on the left than on the right

The screen is not scrollable so not possible to click the button when the keyboard is visible

In the PR description, it says

Switched to WCOutlinedTypedTextField like it's used in OrderCreateEditProductDiscountScreen and changed the button to use WCColoredButton as suggested here by @kidinov

But I still see WCMaterialOutlinedCurrencyEditTextView is being used

We'd need to fix the layout for the text that displays the change

* Just an advice for the future PR - better to make the not toggle "clickable" including the text itself and with some padding so it's easier to tap on

Sorry for the confusion @kidinov my PR description was innaccurate. Those changes are in this PR:

https://github.com/woocommerce/woocommerce-android/pull/11593/commits

I will update the margin and padding there as well.

backwardstruck added 8 commits May 26, 2024 10:39

Make field editable

ec8ff7b

Detekt

c864ad3

Update the VM

c84c66f

Calculate change due

f1b6615

Code cleanup

55cb6f7

Don't show negative values

db5231a

Detekt

2c1f337

Navigate back with the action

eb4caba

backwardstruck added this to the 18.9 milestone May 26, 2024

backwardstruck added 2 commits May 26, 2024 16:17

Handle payment made argument

a089732

Detekt and correct nav arg param

0c1a5ba

backwardstruck changed the base branch from trunk to 11525-change-due-calculator-ui-part-4 May 26, 2024 20:35

backwardstruck added type: enhancement A request for an enhancement. feature: mobile payments Related to mobile payments / card present payments / Woo Payments. status: feature-flagged Behind a feature flag. Milestone is not strongly held. labels May 26, 2024

backwardstruck mentioned this pull request May 27, 2024

[Payment Method Improvements] Create the "Mark Order as Complete" Button #11570

Merged

1 task

Base automatically changed from 11525-change-due-calculator-ui-part-4 to 11525-change-due-calculator-ui-part-3 May 27, 2024 15:26

Merge branch '11525-change-due-calculator-ui-part-3' into 11583-tappi…

d5747fb

…ng-order-complete-button-equivalent-tapping-mark-as-paid

backwardstruck added the unit-tests-exemption label May 27, 2024

backwardstruck marked this pull request as ready for review May 27, 2024 19:21

Base automatically changed from 11525-change-due-calculator-ui-part-3 to trunk May 28, 2024 13:57

kidinov self-assigned this May 28, 2024

kidinov reviewed May 28, 2024

View reviewed changes

...tlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorViewModel.kt Show resolved Hide resolved

kidinov self-requested a review May 28, 2024 15:10

kidinov approved these changes May 28, 2024

View reviewed changes

kidinov merged commit 0ca694b into trunk May 28, 2024
18 of 20 checks passed

kidinov deleted the 11583-tapping-order-complete-button-equivalent-tapping-mark-as-paid branch May 28, 2024 15:11

This was referenced May 28, 2024

[Payment Method Improvements] Implement record transaction details to order note functionality #11585

Closed

[Payment Method Improvements] Implement record transaction details to order note functionality #11594

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Payment Method Improvements] Tapping Order Complete button should be equivalent tapping Mark as Paid #11587

[Payment Method Improvements] Tapping Order Complete button should be equivalent tapping Mark as Paid #11587

backwardstruck commented May 26, 2024 •

edited

Loading

dangermattic commented May 26, 2024 •

edited

Loading

wpmobilebot commented May 26, 2024 •

edited

Loading

codecov-commenter commented May 26, 2024 •

edited

Loading

kidinov May 28, 2024 •

edited

Loading

backwardstruck May 28, 2024

kidinov commented May 28, 2024 •

edited

Loading

kidinov left a comment

backwardstruck commented May 28, 2024

[Payment Method Improvements] Tapping Order Complete button should be equivalent tapping Mark as Paid #11587

[Payment Method Improvements] Tapping Order Complete button should be equivalent tapping Mark as Paid #11587

Conversation

backwardstruck commented May 26, 2024 • edited Loading

Description

Testing instructions

dangermattic commented May 26, 2024 • edited Loading

wpmobilebot commented May 26, 2024 • edited Loading

codecov-commenter commented May 26, 2024 • edited Loading

Codecov Report

kidinov May 28, 2024 • edited Loading

Choose a reason for hiding this comment

backwardstruck May 28, 2024

Choose a reason for hiding this comment

kidinov commented May 28, 2024 • edited Loading

kidinov left a comment

Choose a reason for hiding this comment

backwardstruck commented May 28, 2024

backwardstruck commented May 26, 2024 •

edited

Loading

dangermattic commented May 26, 2024 •

edited

Loading

wpmobilebot commented May 26, 2024 •

edited

Loading

codecov-commenter commented May 26, 2024 •

edited

Loading

kidinov May 28, 2024 •

edited

Loading

kidinov commented May 28, 2024 •

edited

Loading